Merge branch 'master' of github.com:SiriDB/siridb-server into logdata
authorJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 16 Mar 2018 12:08:23 +0000 (13:08 +0100)
committerJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 16 Mar 2018 12:08:23 +0000 (13:08 +0100)

Trivial merge